From ba288650cdbd8f0f0f1b2ba43b385d20ea596a08 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 Dec 2003 22:53:22 +0000 Subject: [PATCH] Don't crash if icon_theme_builtin_icons hasn't been initialized. (#128726, Sun Dec 7 23:45:40 2003 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if icon_theme_builtin_icons hasn't been initialized. (#128726, Diego Gonzalez) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkicontheme.c | 4 +++- 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 79f22690d8..ee3b9a6db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Dec 7 23:45:40 2003 Matthias Clasen + + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if + icon_theme_builtin_icons hasn't been initialized. (#128726, Diego + Gonzalez) + 2003-12-07 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 79f22690d8..ee3b9a6db1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Dec 7 23:45:40 2003 Matthias Clasen + + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if + icon_theme_builtin_icons hasn't been initialized. (#128726, Diego + Gonzalez) + 2003-12-07 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 79f22690d8..ee3b9a6db1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Dec 7 23:45:40 2003 Matthias Clasen + + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if + icon_theme_builtin_icons hasn't been initialized. (#128726, Diego + Gonzalez) + 2003-12-07 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 79f22690d8..ee3b9a6db1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Dec 7 23:45:40 2003 Matthias Clasen + + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if + icon_theme_builtin_icons hasn't been initialized. (#128726, Diego + Gonzalez) + 2003-12-07 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 79f22690d8..ee3b9a6db1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Dec 7 23:45:40 2003 Matthias Clasen + + * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Don't crash if + icon_theme_builtin_icons hasn't been initialized. (#128726, Diego + Gonzalez) + 2003-12-07 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_icon): Don't use the diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index f9f5070826..533e8cffef 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1252,7 +1252,9 @@ gtk_icon_theme_has_icon (GtkIconTheme *icon_theme, if (g_hash_table_lookup_extended (priv->all_icons, icon_name, NULL, NULL)) return TRUE; - if (g_hash_table_lookup_extended (icon_theme_builtin_icons, + + if (icon_theme_builtin_icons && + g_hash_table_lookup_extended (icon_theme_builtin_icons, icon_name, NULL, NULL)) return TRUE; -- 2.30.2